Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <[email protected]>
Tue, 16 Dec 2014 14:41:00 +0000 (09:41 -0500)
committerTom Rini <[email protected]>
Tue, 16 Dec 2014 14:41:00 +0000 (09:41 -0500)

Trivial merge